Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustdoc: Fix issues with cross-crate inlined associated items #46384

Merged
merged 1 commit into from
Dec 3, 2017

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Nov 29, 2017

  • Visibility was missing from impl items.
  • Attributes and docs were missing from consts and types in impls.
  • Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.

* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
@rust-highfive
Copy link
Collaborator

r? @frewsxcv

(rust_highfive has picked a reviewer for you, use r? to override)

// @has - '//*[@id="associatedconstant.PublicConst"]' 'pub const PublicConst: u8'
// @has - '//*[@class="docblock"]' 'PublicConst: u8 = 123'
// @has - '//*[@class="docblock"]' 'docs for PublicConst'
// @!has - 'private_method'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this form of @!has test work? I would assume that this form was looking for an XPath, not a text string.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This form isn't looking for an XPath

* `@has PATH PATTERN` and `@matches PATH PATTERN` checks for

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, nice. I guess i'm not used to seeing that form.

@QuietMisdreavus
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Nov 30, 2017

📌 Commit b444843 has been approved by QuietMisdreavus

@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 30, 2017
arielb1 pushed a commit to arielb1/rust that referenced this pull request Nov 30, 2017
…etMisdreavus

rustdoc: Fix issues with cross-crate inlined associated items

* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
arielb1 pushed a commit to arielb1/rust that referenced this pull request Nov 30, 2017
…etMisdreavus

rustdoc: Fix issues with cross-crate inlined associated items

* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
arielb1 pushed a commit to arielb1/rust that referenced this pull request Nov 30, 2017
…etMisdreavus

rustdoc: Fix issues with cross-crate inlined associated items

* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
arielb1 pushed a commit to arielb1/rust that referenced this pull request Nov 30, 2017
…etMisdreavus

rustdoc: Fix issues with cross-crate inlined associated items

* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
@bors
Copy link
Contributor

bors commented Dec 3, 2017

⌛ Testing commit b444843 with merge 16ba459...

bors added a commit that referenced this pull request Dec 3, 2017
rustdoc: Fix issues with cross-crate inlined associated items

* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
@bors
Copy link
Contributor

bors commented Dec 3, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: QuietMisdreavus
Pushing 16ba459 to master...

@bors bors merged commit b444843 into rust-lang:master Dec 3, 2017
@ollie27 ollie27 deleted the rustdoc_inline_assoc branch December 3, 2017 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants